From 455bc10de5a184f58577ddc8fee5b0a43950a88e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 9 Mar 2007 23:36:55 +0000 Subject: [PATCH] Don't commit modifier-adorned characters. (#331369, #335796, Lin Ma and 2007-03-09 Matthias Clasen * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress): Don't commit modifier-adorned characters. (#331369, #335796, Lin Ma and others) svn path=/trunk/; revision=17446 --- ChangeLog | 7 +++++++ modules/input/gtkimcontextxim.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 65f5668a2c..52d957a606 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-03-09 Matthias Clasen + + * modules/input/gtkimcontextxim.c + (gtk_im_context_xim_filter_keypress): Don't commit + modifier-adorned characters. (#331369, #335796, Lin Ma + and others) + 2007-03-09 Matthias Clasen * Everywhere: Remove unnecessary NULL checks before diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index 00d2bfebd4..addcabf140 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -728,6 +728,10 @@ gtk_im_context_xim_filter_keypress (GtkIMContext *context, if (XFilterEvent ((XEvent *)&xevent, GDK_DRAWABLE_XID (context_xim->client_window))) return TRUE; + if (event->state & + (gtk_accelerator_get_default_mod_mask () & ~(GDK_SHIFT_MASK | GDK_CONTROL_MASK))) + return FALSE; + again: if (ic) num_bytes = XmbLookupString (ic, &xevent, buffer, buffer_size, &keysym, &status); -- 2.30.2